Skip to content

Implement a mark-as-merged action for shipitscript (bug 1890753)#1312

Merged
Eijebong merged 1 commit intomozilla-releng:masterfrom
Eijebong:shipit-mark-as-merged
Jan 29, 2026
Merged

Implement a mark-as-merged action for shipitscript (bug 1890753)#1312
Eijebong merged 1 commit intomozilla-releng:masterfrom
Eijebong:shipit-mark-as-merged

Conversation

@Eijebong
Copy link
Contributor

The API is getting implemented as part of mozilla-releng/shipit#1801

# ACTION_MAP {{{1
ACTION_MAP = {
"mark-as-shipped": mark_as_shipped_action,
"mark-as-merged": mark_as_merged_action,
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Did you consider making a single action called "mark-completed" or something that can handle both? Or is that not really viable due to how releases vs merges are handled in shipit?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It could be possible I guess, although it might get a bit crafty because we don't want to be able to call mark-as-shipped from merge automation for example. And since we rely on scopes for the action instead of the payload, I don't think it's worth adding a second scope onto everything.

Copy link
Contributor

@ahal ahal left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah didn't mean to approve due to the tox failures, but looks good barring that.

@Eijebong Eijebong force-pushed the shipit-mark-as-merged branch 2 times, most recently from 8a14a06 to 3de6d30 Compare January 9, 2026 12:11
@Eijebong Eijebong requested a review from ahal January 9, 2026 12:15
@Eijebong Eijebong force-pushed the shipit-mark-as-merged branch from 3de6d30 to 9ef3c77 Compare January 29, 2026 15:39
@Eijebong Eijebong enabled auto-merge (squash) January 29, 2026 15:39
@Eijebong Eijebong merged commit d9a794a into mozilla-releng:master Jan 29, 2026
8 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants